get rid of hack_hack(), use NEEDS_BABL_DB instead

diff --git a/babl/babl-component.c b/babl/babl-component.c
index 0d036474ff63cb672ab3e6ce40988c758c984de0..65e876781522b69219f02dac1079b2d80cef7ee7 100644 (file)
--- a/babl/babl-component.c
+++ b/babl/babl-component.c
@@ -17,6 +17,7 @@
  */
 
 #include "config.h"
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"
 #include <string.h>

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 99a1e34b66b324958ccc2ede4e7fd237ff9174ee..446979da3fa696883a1e0cdd7755bd862997a8c4 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"
 

diff --git a/babl/babl-db.h b/babl/babl-db.h
index a07a17bafcfade35fa066612669012851100612d..d576e6c113872439b2bd3ba2db802bd0562a054a 100644 (file)
--- a/babl/babl-db.h
+++ b/babl/babl-db.h
@@ -38,6 +38,9 @@ typedef struct _BablDb
   BablMutex     *mutex;
 } _BablDb;
 
+#ifdef NEEDS_BABL_DB
+static BablDb *db = NULL;
+#endif /* NEEDS_BABL_DB */
 
 BablDb *
 babl_db_init (void);

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 9c05e5387ebc9695387c331e889ab339df44bf43..d0219148a844e9cd37dba3558065c72435d1a926 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -27,6 +27,7 @@
 #define BABL_INIT_HOOK    init_hook (); dynamic_init_hook ();
 #endif
 
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"
 #include "babl-base.h"

diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index dad518b2e474abc1ed502c0dd89eac3ab83bbdba..67e53fbdbd6f5442c0f46906883ac891793995e8 100644 (file)
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -17,7 +17,9 @@
  */
 
 #include "config.h"
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
+#include "babl-db.h"
 #include <stddef.h>
 #include <string.h>
 #include <stdarg.h>

diff --git a/babl/babl-format.c b/babl/babl-format.c
index 830d95fdf9f69742a5b737c1f42425288f8b7d2b..af7af69354ad9939e7e67f9295ec47010de0cadc 100644 (file)
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <math.h>
 
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"
 

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index da5f923ff2e81649093d1c530c4f3426ed10ccb7..fbc45c369e022cb1727df77920ea6a8fa7007bc2 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -112,16 +112,6 @@ Babl   * babl_format_with_model_as_type (Babl           *model,
 int      babl_formats_count             (void);                                     /* should maybe be templated? */
 int      babl_type_is_symmetric         (Babl           *babl);
 
-/* FIXME: nasty,. including the symbol even in files where it is
- * not needed,. and a dummy function to use it in those cases
- */
-static BablDb *db=NULL;
-static void hack_hack (void)
-{
-  if (db==NULL)
-    db=NULL;
-}
-
 /**** LOGGER ****/
 #include <stdarg.h>
 
@@ -152,7 +142,6 @@ real_babl_log (const char *file,
   fprintf (stdout, "\n");
   fflush (NULL);
   return;
-  hack_hack ();
 }
 
 /* Provide a string identifying the current function, non-concatenatable */

diff --git a/babl/babl-model.c b/babl/babl-model.c
index 38bbfc3daaa8eeaf805381fa96970916a679696c..df71be43b6cbfed409d1316aa60090ca26cabe77 100644 (file)
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"
 

diff --git a/babl/babl-type.c b/babl/babl-type.c
index 1bf7a0754d37a84beb8c7d4a5c0b9fad4fe7a918..b8388604b2308c12005fc1f1080681bf271d1dec 100644 (file)
--- a/babl/babl-type.c
+++ b/babl/babl-type.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <math.h>
 
+#define NEEDS_BABL_DB
 #include "babl-internal.h"
 #include "babl-db.h"